some colors and indentation changed