Making improvements suggested by @nllong

@asparke2 FYI