Refactor keyword.evaluate to be cleaner.
Merge pull request #116 from mcomella/keyword_eval_swap

Refactor keyword.evaluate to be cleaner.