Code cleaning. (#16)