Some improvement

Signed-off-by: Yannick Roffin <yroffin@gmail.com>