code cleanup based on comments on pull request