refactoring
refactoring, add styles