Denoise cleanups

Here are my suggestions.