Cleanup of pull request #336