readibility cleanup