Code cleanup

Signed-off-by: Nicola Ferralis <feranick@hotmail.com>