Minor code cleanup from pull request