JCLOUDS-458: Addressing suggestions in PR-31

minor changes

minor changes

minor changes

minor changes