Cleans up functions and generic types.
Merge branch 'master' into structure_cleaning
Merge pull request #24 from skotchvail/structure_cleaning

Structure cleaning---cleans up functions and generic types.