Cleaning up some code to match my style.
Merge remote-tracking branch 'origin/master'