a little cleanup. More to come