Clean up and reorganized