fixing E123 violations