Minor changes

Incorporated suggestions from last comment in #133