Develop refactering