Changes to follow the Meteor Style Guide