Pull request

Commit goals

• make life easier for the reviewer
• separate refactoring from actual changes
• make it easier to undo functionality in the future by reverting a commit
• small enough number of commits to avoid heavy handed merge-time squashing

Commit arrangement

• although in practice refactoring is done as needed, any such commits should go first