Add class descriptor container class.
Remove regions.
Reformat code.