Miscellaneous cleanup and organization.