more style refactoring