Code Violation Fix

Code Violation Fix