Refactoring release build