final rubocop fixes