This is lower priority, but not blocked by any of the other refactoring as it is cosmetic improvements.