coding standards: major scrutinizer issues fixed