operator cleanup
refactor implicit returns out into a filter