Trying to clean up parser