NEXUS-5511: Applied Ben's comment and cleanup.

Such as removal of punctuation