Get rid of unused tokens
Use appropriate capitalization
Distinguish between types and literals