Clean up structure a touch