Additional JavaDocs for Filter and minor cleanup