Just a little cleanup for Stopping Point