(PUP-1640) Fix formatting, typos, etc. found in review

* This removes the data.pp mentioned as the manifest in the
environment.conf file (unused and wrong)
* Typos in comments
* missing end of line on the last line in some source files.