Working on parser.
Cleanup.