code cleaning, again.