Major overhaul following new (implied) style guide