Little code cleanup #