Make minor changes and start fixing Rubocop offenses