Undid last refactoring mistakes