Split up parser creation
Move things around for more sensibility
Organize code
Remove excess spaces