Comments and beautify