JCLOUDS-101 - responding to review comments. Will be squashed down
before pushing to master.