Minor style and more hooper names