further performance improvements
Fixing confusing naming choice