Additional Structure Tidy Up