some cleaning and comments

Signed-off-by: Kamal Farsaoui <elfa.kamal@gmail.com>