Made changes requested to resubmit pull request - only minor
stylistic changes, no logic changes.