Clean up formatting take 2