Static code quality analysis fixes
Added progress towards 1.0 version