Cleanup, coloring fixes