Cleaning up expr, remove cyclic dep
Clean up unused code
Don't use T as module name...
Merge pull request #201 from aterrel/cleanup_expr

Cleans up the expressions a bit