Address review comments from sethladd