ENH: Cleaner logic using SNR computation