clean up a few things that didn't make sense