colors
misc style cleanup