Staring on refactoring