Fix Coding rule non-compliance