style refactor part#1