clean up

don't need testing, still working on names that start with B/F/M.