optimisations

Signed-off-by: Mickael PURET <puret_mickael@yahoo.fr>