Code cleanup; no changes in functionality.