Mostly reorganizational edits