fixing highlight and identation