Style fixes

Makes it follow the puppetlabs style guideline more properly.