Resolve Coding Standards violations