Re-factored executable