Code cleanup for your pull request