this is a nicer rearrangement.  Makes it easier to read and see what's public.