Fixed suggestions from HoundCI