Tided up the preamble