Yeah OK, I'll alter the init.pp to use proper class declarations while I'm there