Tweaked for rubocop