Feature/updates for rubocop

Minor cleanups to make newer rubocop happy.