Clean up color cycle timing code