Clean and beautify