Refactored development cycle