Reworked some bits here
Typo
Fix repeated restarting of puppetdb service
Typo