code cleaning; re-coloring