Did a puppet-lint check and cleaned up some stuff