Code clean up and a few new type definitions