Clean up of retrieval of user input.
Refactored parsing of expression out to it's own class.
Minor cleanups.