Tidied up structure definitions