Clean up on formatting