paren and dict cleanup