Get rid of header shell class, set breakpoints, fix indent

Addresses #774