Use dicts, cleanup