style refactoring, cleaning