Tidy up formatting.