Smaller code cleaning.