Some code cleanning.