Some more code cleaning.