Suggested cleanups from sortie