Refactored executable