Implement some PR feedback