Rewrite Grammar. Refactor Parameter Passing. Clean Up Code.