Just not to break gum on refactoring