Minor code tweakage