remove __setitem__ defined twice and clean some names