Reorganization, formatting update.