General code cleaning.