Improve code
Signed-off-by: Pascal Piche <pascal@nitriques.com>