code cleanup
filter module integration