code cleanup
fix bad regex and new benchmark