Fixed styling issues and upgraded code to support puppet 3.6