Fixed doc comments
Sorted use statements
Fixed doc comments
Merge pull request #116 from bvssvni/expression

Minor cleanup