Beautify code

Hi,

if beautified the code a bit. I've also removed most of the puppet-lint issues.

Regards,
Matthias