cleaning up
cleaning up. todo, config, util. util enriched