Optimisations

Signed-off-by: vlepeule <valerian.lepeule@gmail.com>