Code cleanup plus atemps at filter 'bouncing' data