Tidied up structure