reverted a few tidies to reduce diffs