Put parser into its own class. Added null value to variables. Removed
unused variables/cleaned code.