Cleanup rubocop issues