Reorganization and capitalization
Merge cleanup