More clean one for review

/cc @yzhou2001