Some cosmetic changes.
Definitions of common types