Fixed spacing issues in parser