Ignore --deep
Refactor for increased readability and maintainability