Incorporate feedback from HoundCI