refactor Complete, Edit, Delete parser