Fix up style based on Rubocop output