some cleanup, and removed tokenStart