Puppet style fixes by JHaals