re-index pattern matching code sections (closes #37)
export