clean up and per env coloring