Code review markups
Fix typo, fix up UTs