- simplify regexp code
- fix count again