Undid refactor