clean these up a bit