Changes to make the branch pass rubocop