Some changes are added 

fixed rubocop observations