Some small improvements in the code

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>