[clean up] Minor clean up