renaming and beautification