Tweak default textwidth, and reorganize things