Beautification and simplification
Merge branch 'master' of https://github.com/calebsander/cr