Refactoring - pulling out units filter functions to top level
Refactoring to remove duplication