Finishing up parser

Might as well make it prettier!