Refactored the development / production tools.