Code cleanup based on pull request comments