Clean up, move totalColor check