Executable refactored