Cleanup as requested for pull request