more refactoring, fixing heading styles throughout