Fix momentum KO issue, clean up a little