cleanup in display module
cleanup filters
big cleanups in segment module