restyle and refactor
restyle and refactor