Code cleaning. (#2)