Style fixes from houndci feedback