Parser clean-up: Removed an unused field, added a comment, fixed a memory leak and reformated a function.