Fix synthax with Rubocop recomendations
merge