update styles
code refactoring
code refactoring