Clean up and reorganizing.