Clean up and restructuring
Clean up