Address more review comments from sethladd