did some cleanup work on sentences, but also need to clean up the new code