Code formatting
Cleaning up parser