Fixing coding violations (Artur)