[UPD] Small optimizations