Develop refactor