minor refactoring (renaming), single performance improvement