Tweaked for Rubocop