Reorganizing and formatting