Attempt to simplify leaders.rb