little bit more cleanup