small cleanup - moving things around in an attempt to find a bug