Cleanup - Addressed comments from pull request.