optimisations
Signed-off-by: miton <rem.coll18@gmail.com>