Some code cleaning.