Code cleaning. Related with issue #6.