Fix codding style, as pointed by @jsilvestre. Imporve some comments.