Optimization and unification of the M500 line