Implement all HoundCI-s suggestions