start style refactoring (#2)