fixed E231 violations