More PR feedback refactoring