reformat and rename
remove last Up