clean up some funky code