Updated the comments on formatting more.

  Moved the tokenization into a separate file.
  Added utility class.