Cleaned and reorganized