beautify & fix it