Clean up and organize source