Introduced consts
Simplified the Comments token
Renamed _val -> name