- Fixed grep source.
- Refactorred.