Start refactoring code