Can be private
Reorder methods
Rename filter methods and add tests