Preparing for release of color-1.6

- Cleaned up some code.