Clean up a few colors, comments