More refactoring done
Merge branch 'master' of https://github.com/n3phele/openstack-factory