fix criticisms in PR 143