Few more rubocop issues fixed