Cleanup install.pp code