CEG: restructure/KISS, globals were unneeded