Did some cleaning
Made parsing faster and disambiguated '['