Wrapping up PR feedback