Resolves #41.  Minor code cleanup.