More cleanup and class organization.

- Ace