Reorganizing, cleaning up.