JCLOUDS-457: Fix some nits

Small refactor fixing some style issues.