Cleanup types.h
Merge pull request #41 from levind/working

Working