Revert "Fixed parameter order"

This reverts commit a563576add0ac7a34463f96370d58cca2a9df02d.
Fixed most puppet-lint warnings