End of refactoring (for now)