and some more general code cleansing on the vms view
and some more general code cleansing on the vms view

jparicka/cloudly,ProjectCloudly/cloudly,jparicka/cloudly,ProjectCloudly/cloudly,ProjectCloudly/cloudly,ProjectCloudly/cloudly,ProjectCloudly/cloudly,jparicka/cloudly,jparicka/cloudly,jparicka/cloudly