And more of refactoring