Extra refactoring