Neatening up global objects, refining interface