cleaned up structure commit