Re-struceted
Clean up