Changed my mind about some formatting