a little more cleaning
Before reorganization
reorganizing