more clean-up/restructuring/&c.