MassOnTime: Code readability changes.