Trying to improve on the preformatted sections