Cleanup based on pull request feedback