removed beautify mapping