Clean up and reorganize