This is a tracking issue to address all of the changes that @b-wagn has brought up in his initial review of the codebase. PRs addressing those comments will link to this issue.