syntax fixing part 1
some updates per pull request code review
Remove items that are not curves in a more efficient way