Adding global type definitions
Cleanup