More re-factoring of executable