I agree, but like the other suggestions, I'd like to postpone them to a separate change to really clean up this section.