Some cleanups

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>