Some better compliance with Rubocop