Refactor begun