Refactor code for style failures on Code Climate

[seanhandley]

trafficstars

Our Code Climate score isn't great. We can probably promote some Cs to Bs and Fs to Es if we fix all the style contraventions listed.

Some of those F scores are crying out for a refactoring already, particularly the code that handles Keystone authentication (just try and follow it end-to-end and you'll see how confusing it is). I'll raise a separate issue for that chunk of work at some point (though if anyone else is feeling brave, please do feel free to dive in :wink:).