changes as suggested by David Baumgold

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