Development and refactorings