Rubocop fixes

Run rubocop syntax checking with the latest Rubocop release