Additional helper methods, naming abstractions, better comments, remove all filters now working