Optimizations

Signed-off-by: Timofey <nefelim4ag@gmail.com>