Puppet codestyle changes. Improve readability. Fixes #8