Rackspace Cloud Files

Some more small refactorings to improve the code