Whitespace changes only.
Simplified some expressions.