clean up
rename filter & co to better mirror their purposes