Another code cleaning.