Code cleaning. Few comment clearifications.