Start code refactoring