code optimization based on jakub's feedback

We have adjusted the implementation for live profile tracking based on @jlachor 's feedback here !377 (comment 175675)

Please review and merge if looks good.