Made syntax and style checking as per latest puppet-lint recommendations...

... and added formatting for clarity.