Base: Minor code cleaning