improve code style
merge