some beautify changes