stlye refactor
style refactor