general cleanup
little more cleanup