Reorganization, cleaning up.