Release refactoring