Style
Simplify mass constant setting even more