Minor refactor of init.pp