CLEAN ::: Reorganized the code (again)