Updated rubocop gem and minor cleanup