Major overhaul; style change.