Start refactoring in new branch