style changes
dubious refactoring