Refactoring for clear distinction between development and productive