Clean up code. Fix formatting.
Merge branch 'master' of 'origin/master'