cosmetic, largely whitespace
tiny refactors
various simplifying refactors
these are actually all quite trivial; the diffs are large mainly due
to whitspace and renames
merge stable into default