Refactor goes on