Fix crest issue #162
Incorporate review comments
Incorporate review comments
Remove extraneous imports
Merge pull request #175 from ClearwaterCore/issue162fix

[Reviewer: Ellie] Fix crest issue #162