Minor improvements to structure