Refactor began