Tidied existing structure