Cleanup structure.  Polish.