Better formatting, fixes after proof readding