Enhance grammar to support postfix expression in for loop
Cleanup
Renaming
Clean