Great cleanup.

Extracted more components.