[tweaks] Slight optimizations