refactoring is all, more to come