review comment - better way to handle it