Fixes #14
Refactring to use constants.
Refactoring of expression syntax.