Layout changed. Two constructors instead of one (one for files and the other for command line input). Multiple spaces, tabs, and newlines fixed in getToken method. Return function finished.