Refactoring, Working on tests, and working on eye candy