Cleaned up Parser.java