code cleanup

Signed-off-by: Danilo Lizama <danilo.lizama@lemieuxbedard.com>