Addressed PR comments from @nacx and @zacksh