this closes JCLOUDS-737

cc @adriancole could please review it?
maybe just do a format imports? I think there is some junk in this commit.