cleaned up structure assert a bit