Cleanup based on PR feedback