applied DRY to expression creation
Merge pull request #14 from darkowlzz/dry1

applied DRY to expression creation