Only code refactoring