Improvements recommended by rubocop