Code cleanup.  Add type parameters
7 files changed