reorganization, formatting