refactored based on hound comments
more refactoring based on Joe's comments. Note, not fixing the filter_and_display style calls...because... well... I'm moving on :-)
updates based on joe's comments
minor changes per joe