minor refactoring. no additional features