minor refactoring: increased readability