Refactor and make changes in different commits(jakegoulding.com)

http://jakegoulding.com/blog/2012/11/04/refactor-and-make-changes-in-different-commits/