Handful of formatting fixes to improve rubocop happiness