cleanup and color mods