Feature/fog provider cleanups

Lots of small cleanups, all done by rubocop.