Mostly code cleaning.