Storing raw sentence as well as tokens

Previously only an array of tokens was passed in, which was not ideal as
the tokens were being heuristically determined.
Making style of functions in main more consistent
Removing extra whitespace token