hakiri system:scan changes
- refactoring
- resolved some edge cases