Update rubocop version to 0.21
Fix rubocop warnings