Clean up from PR feedback