Fix error coloring / refactor indentation