Continued to clean up parser