some more minor performance optimization