Updated constraints and masses

Small updates to some classes to make them more generalized/readable