- added eyes & mouth detection
- refactoring