fix variable names, cleaner filter