restyle and rename
adjust style