Little code cleanup