Renaming.
Refactor grammar

 - formal paramter
 - rest parameter
Small refactor
Remove useless code.