Code cleanups

Signed-off-by: Jérôme Benoit <jerome.benoit@grenouille.com>