color, cleanup, naming