Cleaning up and streamlining Types.h,