Fixed style guide issues highlighted by puppet-lint, mostly white space ...

...related and some scoping issues.