Some minor code cleaning.