- refactored Expressions.cs, made for shorter methods
- comments in Conditions.cs, and some renamings for clarity