Clean up comments, cast setFilter input & avoid fluent interfaces.