Refactoring

- Refactoring
- Logging improvements
- Added fnmatching for years