a little bit more cleanup 