[Misc] Minor code cleaning.