Code Cleanup and requirements management