Clean up and restructure.