Made minor changes, directed by code inspector.