refactoring, style update