Simplify and reduce redundancy.
Merge pull request #51 from dereuromark/master-operator-spacing

Simplify and reduce redundancy.