Removed explicit "tuple" types; minor changes