Compliance to Rubocop 0.17