Fixes follow by Rubocop