Cleaning up the structure