comments and code cleanliness for parser