Start refactoring as test preparation