Cleaned up Parser.java some more