minor refactoring
readability