Cleanup, relabeling. No logical change in functionality.