little more cleanup :)