color changes and clean up