Cleanup.
Add class building helpers.