more cleanup
also handle __get_item__
fix E251