Clean up
Moved filter to separate module