Neatened up the structure