Cleaning up some of the code to be more consistant accross files
Merge remote-tracking branch 'origin/CodeCleanup'