Minor code neatening.