ENH: Little restructuring.