Summer Cleaning Part 2 !

Just some cleaning up of the syntax