Project cleanup
More cleanup

Probably going to be a bunch of these today, comments formatting etc.
for project demo.