Added beautify