concatenation with spaces around
strict comparisons
Merge pull request #231 from keradus/cs-fixes

CS fixes