Scrutinizer first inspection CS fixes
Merge pull request #65 from MageTest/feature/scrutinizer-cs-fixes

Scrutinizer first inspection CS fixes