Little code cleaning and improve documentation