Fixed: Indentation and Highlighting