wifi probe code cleanup and better accuracy