Small performance & clarity improvement