LPS-32723

Hey Shuyang,

Your changes look good to me. If you also agree with my changes we can push it to Brian. 

Thanks!