Refactoring for release