Style fixes from @robertkowalski