Minor cleanup of run path and removal of some unneeded comments