Changes to match the new style guidelines