Cleaned up type definitions.