changes as suggested by David Baumgold

@cdodge Changes have beeb done as suggested by David Baumgold.