Codename the cleaner.

Cleaning up the project. One bit at a time.