minor cleanup and refactoring in MassModel.js, see #88