june 2014 refactoring (part 2)