more cleanups and color highlighting