Refactor start