cleanup, format any in the code and fix trouble with White and Color both checked.