Small cleanup of TR's filters