Release build refactoring