Refactoring in order to Rackspace api v2 release