Reorganizing a little