Refactoring and development