Rearrange and better document preamble