Refactored Watermark Filter