Improve filter and function names for more usability