Clean up formatting