Code cleaning. (#5)