Cleaned up the parser

Fixed label only lines.