added angled brackets to autoclose pairs